Haz3l binding uses #965
Haz3l binding uses #965
Conversation
|
Largely finished. Also incorporates some bug fixes to the co-ctx. At the moment, all uses of any binding in a pattern are highlighted orange -- it may be better to have different bindings highlighted different colors. The code itself can be polished a little (in particular, there are still some print statements littered around). |
There was a problem hiding this comment.
Looking pretty good... some small fixes. I think we might want to iterate a bit on the style though... the orange doesn't do a great job of visually associating the use sites with the pattern selection. I think we should maybe use the same color as for the pattern term indicator, but further differentiate the use decoration by maybe making it an outline instead of a solid box, or something like that. maybe a different stroke style. not sure how that will look but worth trying, or maybe some other variation I think.
| @@ -155,6 +155,18 @@ let test_result_layer = | |||
| ); | |||
| }; | |||
|
|
|||
| let get_usage_ids = (zipper, info_map) => { | |||
| /* bad style, does reason have let*? */ | |||
There was a problem hiding this comment.
it does yes; search the codebase. you'll need to import OptUtil.Syntax
| @@ -168,6 +180,16 @@ let deco = | |||
| ~color_highlighting: option(ColorSteps.colorMap), | |||
| ) => { | |||
| let unselected = Zipper.unselect_and_zip(zipper); | |||
| let use_ids = get_usage_ids(zipper, info_map); | |||
| let use_highlights = | |||
| List.flatten( | |||
| let _ = | ||
| List.map( | ||
| usage => { | ||
| print_string(fst(usage)); |
| @@ -319,6 +319,29 @@ module UPat = { | |||
| } | |||
| }; | |||
| }; | |||
|
|
|||
| let rec get_all_bindings = (pat: t) => { | |||
There was a problem hiding this comment.
technically this can be obtained by just extracting the variables names from the pattern's context. but this is going to change a bit with ADTs, so it's fine to just leave it for now. maybe add a "TODO(andrew)" comment on it for me to remind me to update it to the new co-ctx system once its fully in place.
| (item: Ctx.co_item) => {item.id}, | ||
| List.flatten(VarMap.lookup_all(info_exp.free, var)), | ||
| ); | ||
| print_string("co_ctx | "); |
| let updated_map: list(usage_info) = | ||
| List.map( | ||
| (usage_pair: usage_info) => { | ||
| let (var, ids) = usage_pair; |
There was a problem hiding this comment.
just destructure this immediately ie ((var, ids): usage_info) => {...
| add(~self, ~free, union_m([m_scrut] @ pat_ms @ branch_ms)); | ||
| }; | ||
| } | ||
| and upat_to_info_map = | ||
| ( | ||
| ~ctx=Ctx.empty, | ||
| ~mode: Typ.mode=Typ.Syn, | ||
| ~body_ids: list(Id.t)=[Id.invalid], |
There was a problem hiding this comment.
these are the uses, correct? if so, i think they should just be called that, body_ids is vague. also why does it contain Id.invalid by default instead of being empty?
| let self = Typ.Joined(Fun.id, branch_sources); | ||
| let free = Ctx.union([free_scrut] @ branch_frees); | ||
| /* let free = Ctx.union([free_scrut] @ branch_frees); */ |
| body.ids @ def.ids; | ||
| } else { | ||
| body.ids; | ||
| }; |
There was a problem hiding this comment.
consider body_ids @ (is_rec ? def_ids : [])
| let def_ctx = extend_let_def_ctx(ctx, pat, ctx_pat, def); | ||
| let (ty_pat, ctx_pat, _m_pat) = | ||
| upat_to_info_map(~mode=Syn, ~body_ids=body.ids @ def.ids, pat); | ||
| let (def_ctx, is_rec) = extend_let_def_ctx(ctx, pat, ctx_pat, def); |
There was a problem hiding this comment.
i feel like this approach with is_rec is a little indirect. not sure if it's the best way, but you could just do a comparison ctx == def_ctx and avoid having to alter extend_let_def
cyrus-
added
the
needs-polish
Intended behavior is to highlight all uses of a bound variable when the cursor is over a pattern. At the moment, there is code which prints the uses, but the UI portion hasn't been done yet.